Merge from gnulib.

Import getloadavg module from gnulib.

Merge from mainline.

calc/calc-units.el (math-logunits-quant): Add support for
non-logarithmic units.

allout.el (allout-after-copy-or-kill-hook): New hook for extension-specific
processing of killed text.
(allout-mode): Include new allout-after-copy-or-kill-hook among mentioned
hooks.
(allout-kill-line) (allout-kill-topic): Ensure that processing after kill
happens even if barf-if-buffer-read-only is raised.  Include new
allout-after-copy-or-kill-hook among that subsequent processing.
(allout-deannotate-hidden): Actually remove the annotation text properties.

Regenerate lib/getopt_.h.

* allout.el (allout-listify-exposed): Copy text sans text properties.

(allout-listify-exposed): Copy text sans text properties.

nnimap.el (nnimap-update-info): Refactor slightly.
 (nnimap-update-info): Tell Gnus whether there are any \Recent messages.
 (nnimap-update-info): Clean up slightly.
 (nnimap-quirk): Add quirk for Gmail IMAP which bugs out on NUL characters.
 (nnimap-process-quirk): Renamed function to avoid collision.
 (nnimap-update-info): Fix macrology bug-out.

* dbus.texi (Bus names): Adapt descriptions for
dbus-list-activatable-names and dbus-list-known-names.

* net/dbus.el (dbus-list-activatable-names): Add optional argument BUS.

Merge: * image.c: conform to C89 pointer rules

* image.c: conform to C89 pointer rules

Merge: * xml.c: conform to C89 pointer rules

* xml.c: conform to C89 pointer rules

Merge: * ralloc.c: conform to C89 pointer rules

* ralloc.c: conform to C89 pointer rules

Merge: * xfont.c: conform to C89 pointer rules

* xfont.c: conform to C89 pointer rules

Merge: * doprnt.c, indent.c, character.c: conform to C89 pointer rules

* doprnt.c, indent.c, character.c: conform to C89 pointer rules

Merge: * callproc.c: conform to C89 pointer rules

* callproc.c: conform to C89 pointer rules

Merge: * process.c: conform to C89 pointer rules

* process.c: conform to C89 pointer rules

Merge: * lread.c: conform to C89 pointer rules

* lread.c: conform to C89 pointer rules

Merge: * fns.c: conform to C89 pointer rules

* fns.c: conform to C89 pointer rules

Merge: * callint.c: conform to C89 pointer rules

* callint.c: conform to C89 pointer rules

Merge: * editfns.c: conform to C89 pointer rules

* editfns.c: conform to C89 pointer rules

Merge: * print.c: conform to C89 pointer rules

* print.c: conform to C89 pointer rules

Merge: * data.c etc: conform to C89 pointer rules

* data.c etc: conform to C89 pointer rules

Merge from mainline.

Merge: * alloc.c: conform to C89 pointer rules

* alloc.c: conform to C89 pointer rules

Eliminate newline

calc.texi (Logarithmic Units): New section

Merge: * search.c: conform to C89 pointer rules

* search.c: conform to C89 pointer rules

Merge: * casefiddle.c: conform to C89 pointer rules

* casefiddle.c: conform to C89 pointer rules

Merge: * dired.c: conform to C89 pointer rules

* dired.c: conform to C89 pointer rules

Merge from mainline.

Merge: gnulib: allow multiple gnulib generated replacements to coexist

gnulib: allow multiple gnulib generated replacements to coexist

This defines a few preprocessor symbols that should not affect Emacs.
* lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
via "make sync-from-gnulib".

calc/README:  Add mention of logarithmic units.
calc/calc-help.el (calc-logunits-add): Rename from `calc-logunits-plus'.
(calc-logunits-sub): Rename from `calc-logunits-minus'.
(calc-logunits-mul): Rename from `calc-logunits-times'.
(calcFunc-lupoweradd): Rename from `calcFunc-lupowerplus'.
(calcFunc-lupowersub): Rename from `calcFunc-lupowerminus'.
(calcFunc-lupowermul): Rename from `calcFunc-lupowertimes'.
calc/calc-ext.el (calc-init-extensions): Change names of logarithmic
unit functions in autoloads.

Merge from mainline.

* lisp/net/rcirc.el (rcirc-handler-317): New function. (Bug#6507)

Update ChangeLog

calc/calc.el (calc-logunits-field-reference) Renamed from
`calc-default-field-reference-level'.
(calc-logunits-power-reference): Renamed from `calc-default-power-reference-level'

calc/calc-units.el (math-logunits-quant):  Renamed from `math-logunits-level'
(math-logunits-plus):  Renamed from math-logcombine.
(calcFunc-luplus, calcFunc-luminus calc-luplus, calc-luminus): Remove functions.
(calcFunc-lufieldplus, calcFunc-lupowerplus, calcFunc-lufieldminus)
(calcFunc-lufieldminus,calc-logunits-plus calc-logunits-minus): New functions.
(calcFunc-fieldquant): Renamed from `calcFunc-fieldlevel'.
(calcFunc-powerquant): Renamed from `calcFunc-powerlevel'.
(calc-logunits-quantity): Renamed from `calc-level'.
(calcFunc-dbfieldlevel, calcFunc-dbpowerlevel, calcFunc-npfieldlevel)
(calcFunc-nppowerlevel,calc-logunits-dblevel, calc-logunits-nplevel)
(math-logunits-times, calcFunc-lufieldtimes, calcFunc-lupowertimes)
(calc-logunits-times, math-logunits-divide, calcFunc-lufielddiv)
(calcFunc-lupowerdiv,calc-logunits-divide,math-logunits-level):
New functions.

calc-help.el (calc-u-prefix-help): Removed "L" reference.
(calc-ul-prefix-help): Remove.
(calc-l-prefix-help): New function.
(calc-full-help): Add reference to `calc-l-prefix-help'.

calc-ext.el (calc-init-extensions): Update autoloads.

nntp.el (nntp-finish-retrieve-group-infos): Protect against the first part not returning any data.
proto-stream.el (open-protocol-stream): Document the return value.

Merge: gnulib: undo previous change

gnulib: undo previous change

Merge: * fileio.c: conform to C89 pointer rules

* fileio.c: conform to C89 pointer rules

Merge: * minibuf.c: conform to C89 pointer rules

* minibuf.c: conform to C89 pointer rules

Merge: * keymap.c: conform to C89 pointer rules

* keymap.c: conform to C89 pointer rules

Merge: * insdel.c: conform to C89 pointer rules

* insdel.c: conform to C89 pointer rules

Merge from mainline.

Remove the check for non-ASCII in report-emacs-bug-hook (Bug#7925).

* mail/emacsbug.el (report-emacs-bug-hook): Remove the check for
non-ASCII characters.

message.el (message-setup-1): Handle message-generate-headers-first set to t.

Merge: * keyboard.c: conform to C89 pointer rules

* keyboard.c: conform to C89 pointer rules

Merge: * image.c: conform to C89 pointer rules

* image.c: conform to C89 pointer rules

[merge] gnulib: adjust to upstream _HEADERS change

gnulib: adjust to upstream _HEADERS change

Merge: * xfns.c: conform to C89 pointer rules

* xfns.c: conform to C89 pointer rules

Merge: * xterm.c: Avoid unportable int assumption.

* xterm.c (x_alloc_nearest_color_1): Avoid unportable int assumption.

Emacs assumes two's complement elsewhere, but the assumption is
easy to remove here, and this suppresses a warning with Sun C 5.8.

Merge: * xterm.c: conform to C89 pointer rules

* xterm.c: conform to C89 pointer rules

* doc.c: conform to C89 pointer rules

* doc.c: conform to C89 pointer rules

(get_doc_string, Fsnarf_documentation, Fsubstitute_command_keys):
Change types between char * and unsigned char *, to satisfy C89
rules about pointer type compatibility.

Merge: don't ignore chdir failure

don't ignore chdir failure

* sysdep.c (sys_subshell) [!defined DOS_NT]: Diagnose chdir
failure and exit.
(sys_subshell) [defined DOS_NT]: Mark with a FIXME the two
remaining unchecked chdir calls in this function; some DOS/NT
expert needs to fix them.
* emacs.c (main): Mark with a FIXME the unchecked chdir calls
in this function; some NextStep expert needs to fix them.

Merge from mainline.

gnus-overrides.texi: Renamed from overrides.texi and all the relevant manuals use it now.
Makefile.in (nowebhack): Fixed to use -D flag instead of overrides.

Merge from mainline.

bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.

Merge from emacs-23; up to r100454.

* lisp/emacs-lisp/cl-macs.el (return-from): Fix doc typo.

Merge from mainline.

* lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
(Bug#6386).

* lisp/progmodes/sh-script.el (sh-here-doc-open-re): Don't rely on the
font-lock-syntax-table remappings.
(sh-here-doc-markers, sh-here-doc-re): Remove.
(sh-font-lock-close-heredoc): Remove.
(sh-syntax-propertize-here-doc): New function.
(sh-font-lock-open-heredoc): Set the sh-here-doc-marker property
instead of the sh-here-doc-re.
(sh-font-lock-paren): Don't do anything in comments or strings.
Handle line continuations.  Accept a few more chars.
Don't rely on the font-lock-syntax-table remappings.
`esac' is not a valid pattern.
(sh-syntax-propertize-function): Handle here-docs differently, so we
don't bother syntax-propertizing the insides.

* lisp/progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):
Handle new bashisms ";&" and ";;&".

overrides.texi: Remove.
sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.

Makefile.in (webhack, nowebhack): New targets that I forgot to merge from Gnus last.

Merge from mainline

Merge: xstrcasecmp: conform to C89 pointer rules